Allow setting paragraph background. (#81045, Gustavo Carneiro, patch by

2005-06-10  Matthias Clasen  <mclasen@redhat.com>

	Allow setting paragraph background.  (#81045, Gustavo
	Carneiro, patch by Jeroen Zwartepoorte)

	* gtk/gtktextlayout.c (set_para_values): Propagate
	pg_bg_color to the display struct.
	(gtk_text_layout_free_line_display): Free it here.

	* gtk/gtktextdisplay.c (render_para): If pg_bg_color
	is set, draw a rectangle in that color behind
	the paragraph.

	* gtk/gtktexttag.c (gtk_text_tag_class_init): Add
	paragraph-background, paragraph-background-gdk and
	paragraph-background-set properties.
	(set_pg_bg_color): A setter for paragraph-background.

	* gtk/gtktextlayout.h (struct _GtkTextLineDisplay): Add
	pg_bg_color.

	* gtk/gtktexttag.h (struct _GtkTextAttributes): Add
	pg_bg_color.
	(struct _GtkTextTag): Add pg_bg_color_set.

diff --git a/ChangeLog b/ChangeLog
index bb100beb0b88477bfb7f41c4bd5023df7868e959..1bbe4634fd6eddce92f5d1af6483027718c80938 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2005-06-10  Matthias Clasen  <mclasen@redhat.com>
+
+       Allow setting paragraph background.  (#81045, Gustavo
+       Carneiro, patch by Jeroen Zwartepoorte)
+       
+       * gtk/gtktextlayout.c (set_para_values): Propagate 
+       pg_bg_color to the display struct.
+       (gtk_text_layout_free_line_display): Free it here.
+
+       * gtk/gtktextdisplay.c (render_para): If pg_bg_color
+       is set, draw a rectangle in that color behind
+       the paragraph.
+
+       * gtk/gtktexttag.c (gtk_text_tag_class_init): Add 
+       paragraph-background, paragraph-background-gdk and
+       paragraph-background-set properties.
+       (set_pg_bg_color): A setter for paragraph-background.
+
+       * gtk/gtktextlayout.h (struct _GtkTextLineDisplay): Add
+       pg_bg_color.
+
+       * gtk/gtktexttag.h (struct _GtkTextAttributes): Add
+       pg_bg_color.
+       (struct _GtkTextTag): Add pg_bg_color_set.
+
 2005-06-10  Kjartan Maraas  <kmaraas@gnome.org>
 
        * gdk/gdkcairo.c: (gdk_cairo_set_source_pixbuf): Destroy the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bb100beb0b88477bfb7f41c4bd5023df7868e959..1bbe4634fd6eddce92f5d1af6483027718c80938 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,28 @@
+2005-06-10  Matthias Clasen  <mclasen@redhat.com>
+
+       Allow setting paragraph background.  (#81045, Gustavo
+       Carneiro, patch by Jeroen Zwartepoorte)
+       
+       * gtk/gtktextlayout.c (set_para_values): Propagate 
+       pg_bg_color to the display struct.
+       (gtk_text_layout_free_line_display): Free it here.
+
+       * gtk/gtktextdisplay.c (render_para): If pg_bg_color
+       is set, draw a rectangle in that color behind
+       the paragraph.
+
+       * gtk/gtktexttag.c (gtk_text_tag_class_init): Add 
+       paragraph-background, paragraph-background-gdk and
+       paragraph-background-set properties.
+       (set_pg_bg_color): A setter for paragraph-background.
+
+       * gtk/gtktextlayout.h (struct _GtkTextLineDisplay): Add
+       pg_bg_color.
+
+       * gtk/gtktexttag.h (struct _GtkTextAttributes): Add
+       pg_bg_color.
+       (struct _GtkTextTag): Add pg_bg_color_set.
+
 2005-06-10  Kjartan Maraas  <kmaraas@gnome.org>
 
        * gdk/gdkcairo.c: (gdk_cairo_set_source_pixbuf): Destroy the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bb100beb0b88477bfb7f41c4bd5023df7868e959..1bbe4634fd6eddce92f5d1af6483027718c80938 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,28 @@
+2005-06-10  Matthias Clasen  <mclasen@redhat.com>
+
+       Allow setting paragraph background.  (#81045, Gustavo
+       Carneiro, patch by Jeroen Zwartepoorte)
+       
+       * gtk/gtktextlayout.c (set_para_values): Propagate 
+       pg_bg_color to the display struct.
+       (gtk_text_layout_free_line_display): Free it here.
+
+       * gtk/gtktextdisplay.c (render_para): If pg_bg_color
+       is set, draw a rectangle in that color behind
+       the paragraph.
+
+       * gtk/gtktexttag.c (gtk_text_tag_class_init): Add 
+       paragraph-background, paragraph-background-gdk and
+       paragraph-background-set properties.
+       (set_pg_bg_color): A setter for paragraph-background.
+
+       * gtk/gtktextlayout.h (struct _GtkTextLineDisplay): Add
+       pg_bg_color.
+
+       * gtk/gtktexttag.h (struct _GtkTextAttributes): Add
+       pg_bg_color.
+       (struct _GtkTextTag): Add pg_bg_color_set.
+
 2005-06-10  Kjartan Maraas  <kmaraas@gnome.org>
 
        * gdk/gdkcairo.c: (gdk_cairo_set_source_pixbuf): Destroy the

diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c
index 94f7a1a8ccd1d608454fb0f04d67b82b13ed9e6d..6c0f6c06340212680197a1e088db76daad678cdf 100644 (file)
--- a/gtk/gtktextdisplay.c
+++ b/gtk/gtktextdisplay.c
@@ -532,6 +532,25 @@ render_para (GtkTextRenderer    *text_renderer,
         }
       else
         {
+          if (line_display->pg_bg_color)
+            {
+              GdkGC *bg_gc;
+              
+              bg_gc = gdk_gc_new (text_renderer->drawable);
+              gdk_gc_set_fill (bg_gc, GDK_SOLID);
+              gdk_gc_set_rgb_fg_color (bg_gc, line_display->pg_bg_color);
+            
+              gdk_draw_rectangle (text_renderer->drawable,
+                                  bg_gc,
+                                  TRUE,
+                                  x + line_display->left_margin,
+                                  selection_y,
+                                  screen_width,
+                                  selection_height);
+              
+              gdk_gc_unref (bg_gc);
+            }
+        
          text_renderer_set_selected (text_renderer, FALSE);
          pango_renderer_draw_layout_line (PANGO_RENDERER (text_renderer),
                                           line, 

diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 4d619ca49cbea1d30d164523874ad3dbad0d2009..be77af2971b528d92695b010321891ea809a95d9 100644 (file)
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -1297,6 +1297,11 @@ set_para_values (GtkTextLayout      *layout,
     }
 
   display->total_width = MAX (layout->screen_width, layout->width) - display->left_margin - display->right_margin;
+  
+  if (style->pg_bg_color)
+    display->pg_bg_color = gdk_color_copy (style->pg_bg_color);
+  else
+    display->pg_bg_color = NULL;  
 }
 
 static PangoAttribute *
@@ -2155,6 +2160,9 @@ gtk_text_layout_free_line_display (GtkTextLayout      *layout,
           g_slist_free (display->cursors);
         }
       g_slist_free (display->shaped_objects);
+      
+      if (display->pg_bg_color)
+        gdk_color_free (display->pg_bg_color);
 
       g_free (display);
     }

diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h
index 36a6efb51f66162fdc42fe4ecfaf5d55fcb1af19..21e3d53e124701f1c030093ded40c0406cd6721a 100644 (file)
--- a/gtk/gtktextlayout.h
+++ b/gtk/gtktextlayout.h
@@ -252,6 +252,8 @@ struct _GtkTextLineDisplay
 
   gboolean size_only;
   GtkTextLine *line;
+  
+  GdkColor *pg_bg_color;
 };
 
 extern PangoAttrType gtk_text_attr_appearance_type;

diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index 56db57e46f34fec663463036404a207979909173..ce08e962734e6a5e7c2d63bb2e459520437fe887 100644 (file)
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -105,6 +105,8 @@ enum {
   PROP_LANGUAGE,
   PROP_TABS,
   PROP_INVISIBLE,
+  PROP_PARAGRAPH_BACKGROUND,
+  PROP_PARAGRAPH_BACKGROUND_GDK,
   
   /* Whether-a-style-arg-is-set args */
   PROP_BACKGROUND_SET,
@@ -134,6 +136,7 @@ enum {
   PROP_LANGUAGE_SET,
   PROP_TABS_SET,
   PROP_INVISIBLE_SET,
+  PROP_PARAGRAPH_BACKGROUND_SET,
 
   LAST_ARG
 };
@@ -503,6 +506,37 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                          FALSE,
                                                          GTK_PARAM_READWRITE));
 
+  /**
+   * GtkTextTag:paragraph-background:
+   *
+   * The paragraph background color as a string.
+   *
+   * Since: 2.8
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_PARAGRAPH_BACKGROUND,
+                                   g_param_spec_string ("paragraph-background",
+                                                        P_("Paragraph background color name"),
+                                                        P_("Paragraph background color as a string"),
+                                                        NULL,
+                                                        GTK_PARAM_WRITABLE));
+
+  /**
+   * GtkTextTag:paragraph-background-gdk:
+   *
+   * The paragraph background color as a as a (possibly unallocated) 
+   * #GdkColor.
+   *
+   * Since: 2.8
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_PARAGRAPH_BACKGROUND_GDK,
+                                   g_param_spec_boxed ("paragraph-background-gdk",
+                                                       P_("Paragraph background color"),
+                                                       P_("Paragraph background color as a (possibly unallocated) GdkColor"),
+                                                       GDK_TYPE_COLOR,
+                                                       GTK_PARAM_READWRITE));
+
   /* Style props are set or not */
 
 #define ADD_SET_PROP(propname, propval, nick, blurb) g_object_class_install_property (object_class, propval, g_param_spec_boolean (propname, nick, blurb, FALSE, GTK_PARAM_READWRITE))
@@ -615,6 +649,10 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                 P_("Invisible set"),
                 P_("Whether this tag affects text visibility"));
 
+  ADD_SET_PROP ("paragraph-background-set", PROP_PARAGRAPH_BACKGROUND_SET,
+                P_("Paragraph background set"),
+                P_("Whether this tag affects the paragraph background color"));
+  
   signals[EVENT] =
     g_signal_new ("event",
                   G_OBJECT_CLASS_TYPE (object_class),
@@ -725,6 +763,34 @@ set_fg_color (GtkTextTag *tag, GdkColor *color)
     }
 }
 
+static void
+set_pg_bg_color (GtkTextTag *tag, GdkColor *color)
+{
+  if (color)
+    {
+      if (!tag->pg_bg_color_set)
+        {
+          tag->pg_bg_color_set = TRUE;
+          g_object_notify (G_OBJECT (tag), "paragraph-background-set");
+        }
+      else
+       gdk_color_free (tag->values->pg_bg_color);
+
+      tag->values->pg_bg_color = gdk_color_copy (color);
+    }
+  else
+    {
+      if (tag->pg_bg_color_set)
+        {
+          tag->pg_bg_color_set = FALSE;
+          g_object_notify (G_OBJECT (tag), "paragraph-background-set");
+         gdk_color_free (tag->values->pg_bg_color);
+        }
+
+      tag->values->pg_bg_color = NULL;
+    }
+}
+
 static PangoFontMask
 get_property_font_set_mask (guint prop_id)
 {
@@ -1197,6 +1263,27 @@ gtk_text_tag_set_property (GObject      *object,
       size_changed = TRUE;
       break;
       
+    case PROP_PARAGRAPH_BACKGROUND:
+      {
+        GdkColor color;
+
+        if (gdk_color_parse (g_value_get_string (value), &color))
+          set_pg_bg_color (text_tag, &color);
+        else
+          g_warning ("Don't know color `%s'", g_value_get_string (value));
+
+        g_object_notify (object, "paragraph-background-gdk");
+      }
+      break;
+
+    case PROP_PARAGRAPH_BACKGROUND_GDK:
+      {
+        GdkColor *color = g_value_get_boxed (value);
+
+        set_pg_bg_color (text_tag, color);
+      }
+      break;
+
       /* Whether the value should be used... */
 
     case PROP_BACKGROUND_SET:
@@ -1331,6 +1418,10 @@ gtk_text_tag_set_property (GObject      *object,
       size_changed = TRUE;
       break;
       
+    case PROP_PARAGRAPH_BACKGROUND_SET:
+      text_tag->pg_bg_color_set = g_value_get_boolean (value);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1519,6 +1610,10 @@ gtk_text_tag_get_property (GObject      *object,
       g_value_set_boolean (value, tag->values->invisible);
       break;
       
+    case PROP_PARAGRAPH_BACKGROUND_GDK:
+      g_value_set_boxed (value, tag->values->pg_bg_color);
+      break;
+
     case PROP_BACKGROUND_SET:
       g_value_set_boolean (value, tag->bg_color_set);
       break;
@@ -1617,9 +1712,14 @@ gtk_text_tag_get_property (GObject      *object,
       g_value_set_boolean (value, tag->invisible_set);
       break;
       
+    case PROP_PARAGRAPH_BACKGROUND_SET:
+      g_value_set_boolean (value, tag->pg_bg_color_set);
+      break;
+
     case PROP_BACKGROUND:
     case PROP_FOREGROUND:
-      g_warning ("'foreground' and 'background' properties are not readable, use 'foreground_gdk' and 'background_gdk'");
+    case PROP_PARAGRAPH_BACKGROUND:
+      g_warning ("'foreground', 'background' and 'paragraph_background' properties are not readable, use 'foreground_gdk', 'background_gdk' and 'paragraph_background_gdk'");
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1919,6 +2019,9 @@ gtk_text_attributes_copy_values (GtkTextAttributes *src,
   if (dest->font)
     dest->font = pango_font_description_copy (src->font);
   
+  if (src->pg_bg_color)
+    dest->pg_bg_color = gdk_color_copy (src->pg_bg_color);
+
   dest->refcount = orig_refcount;
   dest->realized = FALSE;
 }
@@ -1967,7 +2070,10 @@ gtk_text_attributes_unref (GtkTextAttributes *values)
 
       if (values->font)
        pango_font_description_free (values->font);
-      
+
+      if (values->pg_bg_color)
+       gdk_color_free (values->pg_bg_color);
+
       g_free (values);
     }
 }
@@ -1990,6 +2096,11 @@ _gtk_text_attributes_realize (GtkTextAttributes *values,
                             &values->appearance.bg_color,
                             FALSE, TRUE);
 
+  if (values->pg_bg_color)
+    gdk_colormap_alloc_color (cmap,
+                             values->pg_bg_color,
+                             FALSE, TRUE);
+
   values->realized = TRUE;
 }
 
@@ -2012,6 +2123,13 @@ _gtk_text_attributes_unrealize (GtkTextAttributes *values,
   values->appearance.fg_color.pixel = 0;
   values->appearance.bg_color.pixel = 0;
 
+  if (values->pg_bg_color)
+    {
+      gdk_colormap_free_colors (cmap, values->pg_bg_color, 1);
+      
+      values->pg_bg_color->pixel = 0;
+    }
+
   values->realized = FALSE;
 }
 
@@ -2042,6 +2160,11 @@ _gtk_text_attributes_fill_from_tags (GtkTextAttributes *dest,
       if (tag->fg_color_set)
         dest->appearance.fg_color = vals->appearance.fg_color;
       
+      if (tag->pg_bg_color_set)
+        {
+          dest->pg_bg_color = gdk_color_copy (vals->pg_bg_color);
+        }
+
       if (tag->bg_stipple_set)
         {
           g_object_ref (vals->appearance.bg_stipple);
@@ -2164,7 +2287,8 @@ _gtk_text_tag_affects_nonsize_appearance (GtkTextTag *tag)
     tag->fg_color_set ||
     tag->fg_stipple_set ||
     tag->strikethrough_set ||
-    tag->bg_full_height_set;
+    tag->bg_full_height_set ||
+    tag->pg_bg_color_set;
 }
 
 #define __GTK_TEXT_TAG_C__

diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h
index 2074e23d8726bef7fbd820c4751480b1b4cd748c..72071884092cc569d5edc33549da5b435f0cff5e 100644 (file)
--- a/gtk/gtktexttag.h
+++ b/gtk/gtktexttag.h
@@ -75,9 +75,9 @@ struct _GtkTextTag
   guint invisible_set : 1;
   guint editable_set : 1;
   guint language_set : 1;
+  guint pg_bg_color_set : 1;
   guint pad1 : 1;
   guint pad2 : 1;
-  guint pad3 : 1;
 };
 
 struct _GtkTextTagClass
@@ -192,10 +192,7 @@ struct _GtkTextAttributes
   PangoLanguage *language;
 
   /*< private >*/
-  /* I'm not sure this can really be used without breaking some things
-   * an app might do :-/
-   */
-  gpointer padding1;
+  GdkColor *pg_bg_color;
 
   /*< public >*/
   /* hide the text  */